luci-app-shadowsocks-libev: ACL support

Signed-off-by: Kirill Fertikov <[email protected]>

diff --git a/applications/luci-app-shadowsocks-libev/htdocs/luci-static/resources/shadowsocks-libev.js b/applications/luci-app-shadowsocks-libev/htdocs/luci-static/resources/shadowsocks-libev.js
index c0f1ced5534faab6e7038467a498dd73c41bf9cc..d0b06f2429352624c15d630c6aa04806283de000 100644 (file)
--- a/applications/luci-app-shadowsocks-libev/htdocs/luci-static/resources/shadowsocks-libev.js
+++ b/applications/luci-app-shadowsocks-libev/htdocs/luci-static/resources/shadowsocks-libev.js
@@ -170,7 +170,7 @@ return baseclass.extend({
                o.datatype = 'base64';
                o.password = true;
                o.size = 12;
-               o.modalonly = true;;
+               o.modalonly = true;
 
                optfunc(form.Value, 'plugin', _('Plugin')).modalonly = true;
 

diff --git a/applications/luci-app-shadowsocks-libev/htdocs/luci-static/resources/view/shadowsocks-libev/instances.js b/applications/luci-app-shadowsocks-libev/htdocs/luci-static/resources/view/shadowsocks-libev/instances.js
index 671f17a9e41072b807d914e721b648bd34200d29..cc59cfe31837a98c00e56d04ef2429078c538c9a 100644 (file)
--- a/applications/luci-app-shadowsocks-libev/htdocs/luci-static/resources/view/shadowsocks-libev/instances.js
+++ b/applications/luci-app-shadowsocks-libev/htdocs/luci-static/resources/view/shadowsocks-libev/instances.js
@@ -108,6 +108,12 @@ return view.extend({
                                                        o.datatype = 'hostport';
                                                }
                                        }
+                                       if (stype === 'ss_local' || stype === 'ss_server') {
+                                               o = s.taboption('advanced', form.FileUpload, 'acl',
+                                                       _('ACL file'),
+                                                       _('File containing Access Control List'));
+                                               o.root_directory = '/etc/shadowsocks-libev';
+                                       }
                                }, this));
                        }
                };